Drop the anchored field

We can just change priv->root instead.

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index e756b6eb2ebf0885b939662c44b2a4a6d89af4f9..a3a46f739fadc0cfaff77941c6ae5d8f61a89c71 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3755,7 +3755,6 @@ gtk_widget_realize (GtkWidget *widget)
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (priv->anchored || GTK_IS_INVISIBLE (widget));
 
   if (!_gtk_widget_get_realized (widget))
     {
@@ -5493,7 +5492,7 @@ gtk_widget_real_style_updated (GtkWidget *widget)
       if (has_text && gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_TEXT))
         gtk_widget_update_pango_context (widget);
 
-      if (priv->anchored)
+      if (priv->root)
         {
           if (gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_SIZE) ||
               (has_text && gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_TEXT_SIZE)))
@@ -5515,7 +5514,7 @@ gtk_widget_real_style_updated (GtkWidget *widget)
     {
       gtk_widget_update_pango_context (widget);
 
-      if (priv->anchored)
+      if (priv->root)
         gtk_widget_queue_resize (widget);
     }
 }
@@ -11763,23 +11762,6 @@ gtk_widget_in_destruction (GtkWidget *widget)
   return priv->in_destruction;
 }
 
-gboolean
-_gtk_widget_get_anchored (GtkWidget *widget)
-{
-  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-
-  return priv->anchored;
-}
-
-void
-_gtk_widget_set_anchored (GtkWidget *widget,
-                          gboolean   anchored)
-{
-  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-
-  priv->anchored = anchored;
-}
-
 gboolean
 _gtk_widget_get_shadowed (GtkWidget *widget)
 {

diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 16fe80878d19480921b9fab3dedc95d6da96d852..d0f3016364940dbfb379db07b77b35dd6fb73260 100644 (file)
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -58,7 +58,6 @@ struct _GtkWidgetPrivate
 #endif
 
   guint in_destruction        : 1;
-  guint anchored              : 1;
   guint no_surface            : 1;
   guint no_surface_set        : 1;
   guint realized              : 1;
@@ -195,9 +194,6 @@ struct _GtkWidgetPrivate
 GtkCssNode *  gtk_widget_get_css_node       (GtkWidget *widget);
 void         _gtk_widget_set_visible_flag   (GtkWidget *widget,
                                              gboolean   visible);
-gboolean     _gtk_widget_get_anchored       (GtkWidget *widget);
-void         _gtk_widget_set_anchored       (GtkWidget *widget,
-                                             gboolean   anchored);
 gboolean     _gtk_widget_get_shadowed       (GtkWidget *widget);
 void         _gtk_widget_set_shadowed       (GtkWidget *widget,
                                              gboolean   shadowed);

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 8682969454d2514fd70a92d049dd4863a4258b99..719967cd644060224bf0c89b6a09c9db829e75cc 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -1866,7 +1866,6 @@ gtk_window_init (GtkWindow *window)
   widget = GTK_WIDGET (window);
 
   gtk_widget_set_has_surface (widget, TRUE);
-  _gtk_widget_set_anchored (widget, TRUE);
 
   priv->title = NULL;
   priv->wm_role = NULL;